From 91bed02d5ad28591a6a36bd504f818e974206f44 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sat, 9 Feb 2013 06:16:37 +0000
Subject: [PATCH] Misc. minor mechanical changes to reduce warning angst.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4289 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/defs.h          |  4 ++--
 gpsbabel/lowranceusr4.cc | 13 ++++++-------
 gpsbabel/raymarine.cc    | 13 ++++++-------
 gpsbabel/util.cc         |  6 +++---
 gpsbabel/vecs.cc         |  2 +-
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 4c4abbea5..c6c75d722 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -923,7 +923,7 @@ void is_fatal(const int condition, const char*, ...) PRINTFLIKE(2, 3);
 void warning(const char*, ...) PRINTFLIKE(1, 2);
 void debug_print(int level, const char* fmt, ...) PRINTFLIKE(2,3);
 
-ff_vecs_t* find_vec(char *, char**);
+ff_vecs_t* find_vec(const char *, char**);
 void assign_option(const char* vecname, arglist_t* ap, const char* val);
 void disp_vec_options(const char* vecname, arglist_t* ap);
 void disp_vecs(void);
@@ -938,7 +938,7 @@ void printposn(const double c, int is_lat);
 void* xcalloc(size_t nmemb, size_t size);
 void* xmalloc(size_t size);
 void* xrealloc(void* p, size_t s);
-void xfree(void* mem);
+void xfree(const void* mem);
 char* xstrdup(const char* s);
 char* xstrndup(const char* s, size_t n);
 char* xstrndupt(const char* s, size_t n);
diff --git a/gpsbabel/lowranceusr4.cc b/gpsbabel/lowranceusr4.cc
index a0c7520fa..294ba6c14 100644
--- a/gpsbabel/lowranceusr4.cc
+++ b/gpsbabel/lowranceusr4.cc
@@ -108,9 +108,9 @@ lowranceusr4_readstr(char* buf, const int maxlen, gbfile* file, int bytes_per_ch
 }
 
 static void
-lowranceusr4_writestr(char *buf, gbfile *file, int bytes_per_char)
+lowranceusr4_writestr(char *buf, gbfile *file, unsigned int bytes_per_char)
 {
-  int len = 0;
+  unsigned int len = 0;
 
   if (buf) {
     len = strlen(buf);
@@ -127,10 +127,9 @@ lowranceusr4_writestr(char *buf, gbfile *file, int bytes_per_char)
   if (bytes_per_char == 1) {
     (void) gbfwrite(buf, 1, len, file);
   } else {
-    int i, j;
-    for (i = 0; i < len; ++i) {
+    for (unsigned int i = 0; i < len; ++i) {
       gbfputc(buf[i], file_out);
-      for (j = 1; j < bytes_per_char; ++j) {
+      for (unsigned int j = 1; j < bytes_per_char; ++j) {
         gbfputc('\0', file_out);
       }
     }
@@ -498,11 +497,11 @@ lowranceusr4_find_waypt(int uid_unit, int uid_seq_low, int uid_seq_high)
 static void
 lowranceusr4_parse_routes(void)
 {
-  int num_routes, i, j, text_len;
+  unsigned int num_routes, i, j, text_len;
   unsigned int num_legs;
   char buff[MAXUSRSTRINGSIZE + 1];
   waypoint* wpt_tmp;
-  int uid_unit, uid_seq_low, uid_seq_high;
+  unsigned int uid_unit, uid_seq_low, uid_seq_high;
 
   num_routes = gbfgetint32(file_in);
 
diff --git a/gpsbabel/raymarine.cc b/gpsbabel/raymarine.cc
index 8b426ac57..4e03610d2 100644
--- a/gpsbabel/raymarine.cc
+++ b/gpsbabel/raymarine.cc
@@ -144,12 +144,11 @@ find_symbol_num(const char *descr)
 {
   if ((descr != NULL) && (*descr)) {
 
-    int i;
     raymarine_symbol_mapping_t *a;
 
     a = &raymarine_symbols[0];
 
-    for (i = 0; i < RAYMARINE_SYMBOL_CT; i++, a++) {
+    for (unsigned int i = 0; i < RAYMARINE_SYMBOL_CT; i++, a++) {
       if (case_ignore_strcmp(descr, a->name) == 0) {
         return i;
       }
@@ -185,7 +184,8 @@ static void
 raymarine_read(void)
 {
   waypoint *wpt;
-  int ix, rx;
+  unsigned int ix;
+  unsigned int rx;
 
   /* Read all waypoints */
 
@@ -221,7 +221,7 @@ raymarine_read(void)
       wpt->creation_time = EXCEL_TO_TIMET(atof(str));
     }
     if (((str = inifile_readstr(fin, sect, "Bmp"))) && *str) {
-      int symbol = atoi(str);
+      unsigned int symbol = atoi(str);
 
       if ((symbol < 3) && (symbol >= RAYMARINE_SYMBOL_CT)) {
         symbol = RAYMARINE_STD_SYMBOL;
@@ -337,7 +337,7 @@ qsort_cb(const void *a, const void *b)
 static void
 write_waypoint(gbfile *fout, const waypoint *wpt, const int waypt_no, const char *location)
 {
-  char *notes;
+  const char *notes;
   char *name;
   double time;
 
@@ -410,7 +410,6 @@ write_route_head_cb(const route_head *rte)
 static void
 write_route_wpt_cb(const waypoint *wpt)
 {
-  int i;
   static const char *items[] = {
     "Cog",
     "Eta",
@@ -425,7 +424,7 @@ write_route_wpt_cb(const waypoint *wpt)
   };
 
   gbfprintf(fout, "Mk%d=%s" LINE_FEED, rte_wpt_index, (char *)wpt->extra_data);
-  for (i = 0; i < sizeof(items) / sizeof(char *); i++) {
+  for (unsigned i = 0; i < sizeof(items) / sizeof(char *); i++) {
     gbfprintf(fout, "%s%d=%.15f" LINE_FEED, items[i], rte_wpt_index, 0.0);
   }
 
diff --git a/gpsbabel/util.cc b/gpsbabel/util.cc
index a7882c492..54ea46114 100644
--- a/gpsbabel/util.cc
+++ b/gpsbabel/util.cc
@@ -115,12 +115,12 @@ xcalloc(size_t nmemb, size_t size)
 
 void
 #ifdef DEBUG_MEM
-XFREE(void *mem, DEBUG_PARAMS)
+XFREE(const void *mem, DEBUG_PARAMS)
 #else
-xfree(void *mem)
+xfree(const void *mem)
 #endif
 {
-  free(mem);
+  free((void *) mem);
 #ifdef DEBUG_MEM
   debug_mem_output("free, %x, %s, %d\n",
                    mem, file, line);
diff --git a/gpsbabel/vecs.cc b/gpsbabel/vecs.cc
index d7e4d4d3f..176c8f33b 100644
--- a/gpsbabel/vecs.cc
+++ b/gpsbabel/vecs.cc
@@ -1227,7 +1227,7 @@ disp_vec_options(const char *vecname, arglist_t *ap)
 }
 
 ff_vecs_t *
-find_vec(char *vecname, char **opts)
+find_vec(const char *vecname, char **opts)
 {
   vecs_t *vec = vec_list;
   style_vecs_t *svec = style_list;
-- 
2.30.2